Radiator install question

I'm reinstalling my radiator and i can't remember how the hoses connect. The two hoses that go from the filler over the turbo to the radiator.

 

should just be the upper and lower hoses and the fan connections.

 

The one from the cap on the upper resevoir goes to the radiator overflow and the one that comes off the upper resevoir itself returns to the radiator.

 

thanks guys