Factory terminals to re-pin connectors?
As an added note to post 10. Make sure to use Molex sockets. The Amp .093 sockets don't have as much retention force.
Print