update for rfc98 text changes and GD removal