Fix for Am and Pm problem and student nubmer down to 800