Somewhat balanced waiting with new changes included