Worked on Controller implementation