Trigger visbility improvements

Does this need to be static?