new upstream 3.5/decide if 32bit or 64bit