changed chris's stuff