I too have a 2017 AP2.5, MCU1, no FSD, MX. I haven’t decided if the FSD upgrade is worth it since I already have EAP, so the only features are TBD. Is the MCU2 upgrade included in the $4,000 FSD upgrade, or is the $2,500 in addition to the $4,000 for a total $6,500? If included in the $4,000 I...