Optimised for Compass pre-release 1.alpha19