Redo of map-parsing.