update for simpler switching between 32 and 64 bit