updated wait control