3.1 Modified again

Formulas have been slightly changed