changed handling of XRF transitions