Removed the NoWait option