More work on the controllers