more changes suggested by Rob