Unify 4 changes