Major overhall, trigger now works