Updated Sept. 19 changes
Override hash/equals functions