added onEnable and onDisable