added all columns, working on formulas