matching up with safas UI