Support both Horizontal & Vertical in one version