fixed map. Adding functionality.