Implemented new formula's and method of calculation.