I updated the Tesla calculator I posted to include Elon's new pricing for the Model 3 AWD and Performance. I think it´s working right - please let me know if you find any issues (the conditional formatting isn´t 100%, but the numbers should be good).