expression_calculate updated