The 500 mile range is 200kWh I believe. There’s a penalty because they are literally stacking a second pack. Probably not enough room to do that in an S, but I’m sure by then the S will see other upgrades.