Updating lib.
Adding timeouts.