2.0 - Less hacky edition