added waittime todo comment