I'm having to replace the eight (8) pin flat contact housing on my friends Cabrio (it's broken.) If anyone has done this before I'd welcome some pointers. I've ordered the housing (VAG 1J0972708) but I'm not certain if it comes with the flat contacts and I'm also unsure how to remove the contacts from the old housing... any insight appreciated...

EDIT: I found a video that was able to partially answer my questions... I'm assuming the lock for the contacts is maybe somewhat different and I'm still uncertain of the contact size as I need to replace two of them...
How to repair VW wiring connectors. No special tools! -