Would it be possible to unify these branches?