Map Again :)
Revert "Map Again :)"

This reverts commit bbedee407b7845762d6730f09da3c39a6dd5b2ee.