Upgraded Z-Axis Design

My workaround: