adding changes to support x86