Updated threads, added regex