Change way to get token and change token also