Improve $ARCH logic