CD refactor, plane test