Fixing cenarios. Taking out the async threads