Change waits according Irina recomendation