added the converse for 3.17 d
merging changes
more merging changes
even more merging