Updating to use D23 for XRF on indicator.