first pass on xpmt now done