wip/sloccount/patches
