Map update, using Neca's update.
Revert "Map update, using Neca's update."

This reverts commit ad328a75fece7b21854ec8a6f68a4dbe76270300.