Worked on Controller and View