Some changes in the maps
Merge