added swap 32 and swap 64 back in