Trig overhaul