changes suggested by adam