Safc II wiring diagram please help

[300max]

I have a 95 240sx SE. I need to confirm the pinouts for wiring a SAFC II to the stock harness.

So far I have:

#3 RPM
#10 GND
#23 Throttle
#38 Switched power
#47 Airflow (MAF)
#54 Knock sensor

Please let me know if this right before I start ripping into my ecu harness.

Thanks

[drifterx]

the apexi site has it
look for the UPDATED PFD file