Reverted back to custom PartialEq and Show