More waits (because I wasn't thinking) and changed wait button