Some Changes Done My me to avoid error while equal comparision