Reverted back to old graduation and retention loops