N54 vac lines question

I'm getting some decent progress on transferring all the parts on to my new engine and just realised I forgot to make a note of how the vac lines and boost solenoids were connected up. Looking at diagrams on the net I think it is supposed to be like this:



Is this correct? Please excuse my epic paint skills.



This is how the engine is looking at the moment:

Attached Images