Tweaks to count stuff-