Updated controllers to function properly