Worked on Controller and InputParser