Working on making trigger inference more robust