edited server/client