Second attempt at fixing architectures.