some changes targeting the map