WIP try again for xtc goodness