refactor collection to not run any wave before it's time