Much refinement of grant-related logic