Waldo - yes, as I mentioned - it's just a reworking of yours. I had a hard time seeing some details in your image and that's why I redid it a bit more expanded. Thank you for the correction on my layout - I would have screwed it up!!
Waldo, the only complaint I would have on yours is that the 5way connections are not that clear. That's really the only reason I spent the time doing this. And it gave me a better understanding of this before I started doing this little project.