Consolidate waiting states into one