Updated Controllers

Updated Controllers