Added Final_GPA to calculation