refactor to use CE's vertices, rather than creating new setup