Edited map - now through a new map editor, which has not yet made it to
master