Josh's trig changes