Add grade y checks