added chris' classes