Adopt changes suggested by Chris Jones