tweaked new grant stuff