changes acc to new structure