Made changes suggested by Phil.