changes suggested by @jessereynolds