Changed how numbers are handled