Reverted thread listener, changed main handler.