improvements in trigger