Updated the sources to work with the controllers