changed values from expressions to double