unify a bit more