Finished fixing our trig