require paths changed, receipts implemented
fixinf merge problems