Finished ADS Changes