Updated Controller