changes suggested by Rob