Added some time  to the timeouts.