modify wait first