Lina, fixing build but more solid solution wip