added chris's stuff