wip/xlog/patches
