Change wait window
Final version?)