Change grade saving to go usual path.