Made changes suggested