Made changes suggested by Vic