18 xref through 8 updated