enhancements to counting not just timeouts