Saving of anchors
Changes to map code