new stuff for class 2