Move from gr 3.6 to 3.7, first step, change to new gr api.