More changes to Garmin Function