tiny changes (mapG')