flipped ordering
Merge branch 'newgrants' into testing