Updated version of gmap3