Added new formulas and rules