* updated the map and fixed alignment