Compass Refactored