fixing bugs with Sync call flow. It doesnt seem to be working as
expected