Scheme update fixed. Async version updated