Re-doing changes in new structure