Modified analysis controller and model.