More trigger changes