Updated for arm64