Now using new comparator, hopefully the performance will increase