Rohit: remaining controllers and functions added