Updating daemon to have no FE logic