adding token and simplifying