Tweaked waiting