wip/serlook/patches
