Fixed chris's blunders