changes for new structure