Updated to only use x32 versions