Remove Async For Better Consistency