token added, refactoring