small changes for latest running of calcs