dev
code refactoring (async issues)
IAP dev