First version with calculation procedures

Stefan Rajinovic
2021-04-02T07:19:22Z

revert definition of calc proc