add ARCH handling