updates to Final Grades sample to bring it line with new Basic sample