more architectural changes