Now using siunitx package for formatting units