Unify new code, save old