Actually get new trigger code working