Much better, but not perfect, architecture