made it all daemon compatible