Changed waits into non blocking ones