more design structure changes.