MAP GMAP added