deceased controller and model changes