Dictionary update.
Chatora: Fixed all the formulae calculation.