Further attempt to separate triggers and sensors