more changes suggested by John