Finally some changes to the maps