Updated the threads timeout to be more sufficnet