Fixing/Updating code to work with new Garmin design