Comfort Relay wiring help?

[x-works]

In the middle of refurbishing an e30 body loom for somebody at the moment and a previous owner appears to have tried and failed to fit a comfort relay (not sure if thats what they're called, it's the relay that lets you operate the windows/sunroof with keys out and a door open).

The wiring is a bit of a jumble at the moment and none of the comfort relay wiring is connected and I'm trying to get my head around how it should be correctly connected. Tried and failed to find any wiring diagrams online showing the relay.

Have drawn up the diagram below with what I've figured out so far, does this look correct to anyone with experiance of this circuit?

Cheers.

(click on diagram to view full size)

[Brianmoooore]

87a on the relay should have a white/black wire that plugs into socket Q of the accessories socket.
87 + 86 of the relay should have a red/yellow wire that plugs into Z on the acc. socket. There's also a short flying lead from the plug for Q that the red wire from the electric aerial plugs into.
30 on the relay connects to a green/blue wire that connects to the green/blue wire of the sunroof loom. There's also a short flying lead from the sunroof loom plug that connects to the windows loom plug.
Pin 85 of the relay should be a brown/blue wire that goes to the front door pin switches.

As far as I can see, this is exactly what you have in the diagram (which didn't display on my screen, before I wrote the above!)

[Brianmoooore]

That circuit would work. However, there is no need to add the main window/sunroof circuit to it. You could use a standard 85-86-87-30 type relay as the comfort relay and just connect it in parallel to the power window circuit breaker supply line. i.e. the 2.5WT/BK directly to the 2.5GN/BU without the relay between them.

Wouldn't that turn on the ignition when a door is opened, will?

[x-works]

Thank you for your help gentlemen.