- Added more thread robustness
Added robustness to threads