diff --git a/.flake8 b/.flake8
index c0d65cc..57b1023 100644
--- a/.flake8
+++ b/.flake8
@@ -11,6 +11,8 @@ extend-exclude =
     extractors/bookseries/farmers/**
     # greatfarmers bookseries is not being worked on, ignore
     extractors/bookseries/greatfarmers/**
+     # long lines and double quotes ""
+    dependencies/neural-parser-pipeline/**
 
 # 90 is the max line length used by `black`
 max-line-length=90
@@ -27,6 +29,7 @@ per-file-ignores=
     # this file needed some borderline hacky imports
     analysis_toolkit/simple_regex_extractor.py:E402
 
+
 # E203 (whitespace detection before :) is broken with list slicing
 extend-ignore=E203
 
diff --git a/tasks/__init__.py b/tasks/__init__.py
index e35486a..fd3ffc8 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -242,19 +242,18 @@ def nlp_setup(ctx):
     The base repository URL is https://github.com/TurkuNLP/Finnish-dep-parser
     We are using our own repository which contains fixes to make FDP work on Mac OS X.
     """
-    branch_name = 'turkunlp-updates'
-    repository_url = 'https://github.com/Learning-from-our-past/Finnish-dep-parser.git'
-    fdp_dir = 'dependencies/fin-dep-parser'
+    branch_name = 'master'
+    repository_url = 'https://github.com/TurkuNLP/Turku-neural-parser-pipeline.git'
+    npp_dir = 'dependencies/neural-parser-pipeline'
     ctx.run(
-        'git clone -b {} --depth=1 {} {}'.format(branch_name, repository_url, fdp_dir)
-    )
-    ctx.run('rm -rf {}/.git'.format(fdp_dir))
-    ctx.run('rm -rf {}/.gitignore'.format(fdp_dir))
-    ctx.run('cd {}; ./install.sh'.format(fdp_dir))
-    print(
-        'Please specify the Python 2 interpreter in {}/init.sh '
-        'if it is not "python2".'.format(fdp_dir)
+        'git clone -b {} --depth=1 {} {}'.format(
+            branch_name, repository_url, npp_dir
+        )  # python3 fetch_models.py fi_tdt_dia
     )
+    ctx.run('rm -rf {}/.git'.format(npp_dir))
+    ctx.run('rm -rf {}/.gitignore'.format(npp_dir))
+    ctx.run('cd {}; pip install -r requirements.txt'.format(npp_dir))
+    ctx.run('cd {}; python3 fetch_models.py fi_tdt_dia'.format(npp_dir))
 
 
 @task(