Replace bach with async-done