Added skipwait option.