Forgot to put that there to reduce delay
Added some timeouts