More work on the controller logging