updated unify; some issues need to fix