Updated to include max 000s values