Added case ** to diff and improved equals