architectural changes in progress ...