minor architecture changes