Updated to reflect 64 bit changes