Architecture fixing start