Wip/reset branch