added return data and formatting for grades