sync up

s/g changes