Fixed triangle formulas
Done