Made changes requested by uym