initial restructuring for better stats collection