made some changes to controllers