Rehashing - Need to be tested