before reworking the trigger-modifiers
reworked trigger modifiers logic (simplified a lot), but not tests (224 failing)