wip/nodau/patches
