Tweak to waitFor