Work on comparator
Moved some methods