Formulas improvements pull request 1