Did some changes to Controller!