use await() API in more places