Updated grav
Merge fixed