Change so we only need one comparison function