Split old and new engine