Correct hashing now. working on performance