we should be, but I get the point, I'll add a condition based on pillar entry