committing changes before john screws everything up