Moved more hashing away from main