Updated with infection analysis.