caf_trigger modifications