Yes you need to swap the nav A/C auto amp to the non-nav A/C amp as the internal wiring is different between the two. Nav version of our car uses a digital signal while the non-nav version uses an analog signal. This is why you have to add more pins as these extra wires are to send the analog signals to the various controls. I haven't had any issues using Waze or google maps and they look amazing while driving. I actually hid a single dim head unit behind the table, plugged the usb port into that head unit which solved a ton of wiring and also allowed for the steering wheel controls.