updating with latest architecture, no guarantee that it will either run or compile