64 bit
merge in changes