changes suggested by Gordon