Fixes merge
Extracts async thread