updated trigger parser