Reverted back to original async