Update logic to allow for 64-Bit.