Adding more wait commands