Updated Client and Server Threads