Tried to change some files to support ARM