pulling major changes from legacy