Changed access_token logic