Added saving calculated values.