changed for canarymod