Moved some graduation code into retention