Current architecture, more or less