added tokens and define hashing