Nick's edits and change compare to ==