Updated to 64-bit