Separated legacy version from original version