Refactor.
Change to 6-dof marker.