formulas reorganized
more pics