Made changes suggested by Rob