New batteries and platform that could support new Roadster or refresh Model S/X. With the Rivian being 4 motors, that platform would support that too. A Roadster with 600 miles on that platform would deliver about 2/3 that for the truck or 400 miles range. While towing, 200 miles range is still workable with the current Supercharger spacing.