make some additional changes suggested by andrew.solomon44@gmail.com