Changed Compass implementation