model_attrorney improvements