Rebuild the architect