some changes in daemon