Changes on Controllers