added number formatting and missing 'years'