modified up until daemon