Changed the main maps to use the new r/map func