Changes to use si units