Follow up for merge, moving to mod wide packet pipeline