adjusted controller and model #257