Started prep for 64 bit mode switch