grade entry logic changed