Updated Server and Client code
Updated Server and Client code