working on the map - working again