added updates to controller and model