Keep forgetting to make waiting before exit conditional ...