Wip/issue11b