Updated for arm64 compatability