better handling of US numbers