Updated Client and Server