moved to new daemon code