fixing up to match grc api changes