Added ability for user to select number format.