design changes
changed map key
changed the map key
bugs fixed