Worked on adding functionality