couple more merging changes aC to self