FIxed the Server and Client