cleaned up g-maps