equals methods updated