Comply with new DDG changes