removed flags, replaced with waiting