Worked on the changes