Fixed controller, now updates the model's states