New Branch
Refined Formulas
Refined formulae
Tweaking the values
Formatted more code nicely
Master push
Master push