Trig simplification added