Adds  expression and refactors text forcast functions