Revert "Revert "some changes in comparisons""

This reverts commit 0af40af0df7af8615993530119093ea5d3d7b4b5.