removed comments, added awaitdata cursor option