added a concern for tokens