Worked on Functionality