UPDATE

Improvements to calculations for Semester 2