pulling changes from legacy