Revised ADS to match DDS