Updates to support new arch, and tested working