More changes to fast_comparison