Updated controller
Updated controller