changed the parsing of the map within the mapcell/s