updates to Daemon