some small changes, next: change to comparator