moved stuff around for daemon