more changes to architecture