Refactored Garmin