Topic: C4 Speedometer cable routing

[TonyFio]

I'm reinstalling my speedometer cable and have no original photos for my car in this area.
The attached shows what I think is correct, but would appreciate corroboration. In the first photo I have the cable coming through the firewall between the firewall pad and the carpet. The indentation in the pad suggests that.
Then does it stay to the right of the brake pedal assembly and the steering column and then up to the speedometer, or would it possibly go over the steering column then under the brake assembly?
The second photo is my guess as it comes up to the gauges (staying to the right).
Thanks in advance for any help.
(289, C4)