architectural changes mostly done