changes to new structure