Updated threads, broke listener apart