fixed controller and model