Play a little more with no. of tokens + refactor