Removed all uses of .Equals and replaced with appropriate comparisons
Merged conflicts