this belongs here
Trying some less spammy waits