Generalised Form for Grants as well

Fixed a bug with the array size