Finished rebuild outside architecture #34