Refactor/show only stockcount feature