Client/Server code added