improved origin reporting