Updates to gp and rc