Made changes suggested by Brian