This is a step back but makes the controller work for the moment. It should be reimplemented in a better way in the future.