made changes suggested by jake