Fix and wip