architecture improvements