changed the equals() methods again because they didn't seem to come
across the merge.