changes in wait and submit