Fixing Chris's stuff