GPA completed & bug fixed