Amendments to GRAP 16 and GRAP 17