Refactor 3D