reworking to work with CanaryMod 1.2.0