Updates to class two for more excitement