is it something needing to be fixed before the merge or a TODO for later improvements ?