add get token
re factor