bugs
switched back to async completions