Updated High-Energy LHC Design