changes for arm compatability