Revert "Revert "Remembers important parts of map""

This reverts commit fbff8597ac388a971ef31f96768a3371dbb66302.