Not yet perfect (diameter and alignment of the holes) but does the job and indeed an improvement vs the original in the way the parts can be connected.
Great remix of the original design. I printed the original and was unhappy the way the pieces fit together and felt this was a much better approach.
