add return and in the get grade add startTime and endTime