Trigger

Merging in trigger changes