3D support

Early 2021 clean-up: duplicate