Converted to asych tasks