More work on the controller pipe