change to new structure for one solution