Made the changes requested