End of Class update for 06/09