Updated Controller for Assignment