Updates up until class 7