Added threaded interrupt wait