Added the name non-ternimal
Calculations now uses the correct syntax