some UNIFY changes