Refactor/sync stock count after next