split new and old code