Map Update
Revert "Map Update"

This reverts commit a95dbe686ac05cc30b66cd9d826dc29a9209d98c.