lnkd wip
fixed merge conlficts