Yes. That's the right stuff.

Thanks for the tip on the links; they are fixed now.