Fixed issues with timeout not working.
Updated to use defined timeout value.