Added class 8 stuff.