added check 2 specify token as optional GET param