Added standalone number counts computation (untested)