fixed the leave
Merge branch 'newgrants' into testing