With Rivian having announced a long-range (max(ish?) pack) version of the R1S, and it likely being under 400 miles, there's a good chance that the cost to upgrade might fall within $5k - $7.5k depending on how many more miles above 300 they can manage (given that they're charging $10k for 100...