simplify and only use sync api
Merge pull request #1 from lightsofapollo/cleaned-fix

simplify and only use sync api