Updated with x86 version