* Fixed Warning
* Fixed new
* Change Map
* Added Map