Update comparer to working format