start of some architectural changes