I think you are right, I counted the wires and I have 5 more additional wires coming from the engine. I will compare the wiring diagrams of the M30 and M50 to know how to proceed. By the way, the engine is the single vanos M50 not the non-vanos version. I got the pictures to show you the whole wiring harness. I am worried about the dashboard computer the most with respect to this swap.