Added more formulas, still unused though