changes suggested by David