removed orphaned comment
added ability to specify waiting method