Converted all to async