Changed some thresholds mostly