change maps to actual Maps, shuffle maps to add variety