started adding token_fields