minor changes for calc