Assign calculation values: Ability to change the calculation values layout to old version