Modify client so its no longer a thread