Modifying client/server