change start logic, wait for access token
Correct order by function, fixes #12