Still XRays. changed weighting function