Made some changes to Client.js and Server.js