Fixed all bugs related to AP and Extra Semester