Fixed offenses
Merge branch 'triangle_facts'
Adding changes from triangle_facts