Controller class updated

Still version 0.1