Changed the maps to index