When I was considering purchasing my Tesla, it was right at the time they switched from AP1 to AP2 (and bumped the cost from $3k to $5k). It was unclear what was actually going to be included for that fee, and when it would be available. I wanted to take delivery before the end of the year for tax purposes, and my sales person said that I could decide on that portion after ordering because it was a software feature. He said, "you can decide all the way up until the day you are taking delivery for any of the software stuff, but if you want to take delivery as soon as possible, you can order the car now and decide later on the software features." That made sense to me, so I put in the order. Fast forward to a few days ago: I emailed the sales guy and finance person about adding the AP2. I asked about rolling the AP2 into the financing if possible, but wanted to make sure the knew I wanted it so I could get it for the $5k instead of the $6k it would cost after delivery. The finance guy replied saying it couldn't be included in the loan amount because that was already fixed, but asked the sales guy to reply about the particulars about arranging for payment. No response from the sales guy. Today, the day before picking up the car, I reach out to the sales guy and delivery specialist about paying for the AP2 before delivery, and I hear back from the sales guy that Tesla will need to charge me $500 for a change order. I reminded him of our conversation when I was in the showroom, and that he said it was no issue to add it all the way up until I was signing the paperwork. He said, "I understand. I think we had miscommunication. I can submit your request, but it's unlikely to be approved. I'll need you to pay the $500 now, or you can just order it after delivery for the $6,000 cost. I thought I would share this to help anyone who is in the purchasing decision process. If you are told that you can always add the software at any time before delivery for the same cost, know that it will have a $500 change order fee attached to it. The purchasing process with Tesla is admittedly a different animal than with other dealers, so I was a little more trusting of what my salesperson said than I should have been. I should have known that change order fee for hardware modifications applies to any software add-ons prior to delivery.