Updated how thresholds are calculated and displayed;