ADS connector - multiple changes - not finished