Re-build expert arch