changed structure in new design