Committing the suggested changes sans wait_for