added trigger matching