refactor to use pillar data