Feature/nw sync with repo