Also update daemon_controller -.-