FIxed find method and updated hashing function