rework a bit using standard downstream trigger