updating calc docs
syncing with docs
initiatisation
merge conflict