home refactor - counters added