updated shuttles to use refactored map code