Massive infrastructure upgrade