Update for raw values and scientific notation