Major fix.

Recap, Maps, and it has been Tested.