Amended model and adjusted controller to match