updated trigger handler