Adjusted Comparator thingy with rain upgrade.