updated to turn off hash_swap