improvement - lang and counts