Wait For -- keyword improved