Updating the Controller.

It was overwritten by commit of an incomplete version.