Update to chris's code.