changes suggested by tim