XSAF updated