diff --git a/lib/3rdParty/OpenBLAS/OpenBLAS.props b/lib/3rdParty/OpenBLAS/OpenBLAS.props
index f5fcc4a8..e0e8b77c 100644
--- a/lib/3rdParty/OpenBLAS/OpenBLAS.props
+++ b/lib/3rdParty/OpenBLAS/OpenBLAS.props
@@ -8,15 +8,15 @@
$(SolutionDir)lib\3rdParty\OpenBLAS\include;%(AdditionalIncludeDirectories)
- $(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName)\$(PlatformToolset);%(AdditionalLibraryDirectories)
- libopenblas.lib;libopenblas.exp;%(AdditionalDependencies)
+ $(SolutionDir)lib\3rdParty\OpenBLAS\lib\$(PlatformShortName);%(AdditionalLibraryDirectories)
+ libopenblas.dll.a;%(AdditionalDependencies)
- xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)\$(PlatformToolset)\libopenblas.dll" "$(OutDir)"
+ xcopy /I /E /Y /D /C "$(SolutionDir)lib\3rdParty\OpenBlas\bin\$(PlatformShortName)" "$(OutDir)"
diff --git a/lib/3rdParty/OpenBLAS/bin/x64/v140/libopenblas.dll b/lib/3rdParty/OpenBLAS/bin/x64/v140/libopenblas.dll
deleted file mode 100644
index e7c4a3ac..00000000
Binary files a/lib/3rdParty/OpenBLAS/bin/x64/v140/libopenblas.dll and /dev/null differ
diff --git a/lib/3rdParty/OpenBLAS/bin/x86/v140/libopenblas.dll b/lib/3rdParty/OpenBLAS/bin/x86/v140/libopenblas.dll
deleted file mode 100644
index cee0280f..00000000
Binary files a/lib/3rdParty/OpenBLAS/bin/x86/v140/libopenblas.dll and /dev/null differ
diff --git a/lib/3rdParty/OpenBLAS/lib/x64/v140/libopenblas.exp b/lib/3rdParty/OpenBLAS/lib/x64/v140/libopenblas.exp
deleted file mode 100644
index e5e68393..00000000
Binary files a/lib/3rdParty/OpenBLAS/lib/x64/v140/libopenblas.exp and /dev/null differ
diff --git a/lib/3rdParty/OpenBLAS/lib/x64/v140/libopenblas.lib b/lib/3rdParty/OpenBLAS/lib/x64/v140/libopenblas.lib
deleted file mode 100644
index f2125c2e..00000000
Binary files a/lib/3rdParty/OpenBLAS/lib/x64/v140/libopenblas.lib and /dev/null differ
diff --git a/lib/3rdParty/OpenBLAS/lib/x86/v140/libopenblas.exp b/lib/3rdParty/OpenBLAS/lib/x86/v140/libopenblas.exp
deleted file mode 100644
index d1cbfff9..00000000
Binary files a/lib/3rdParty/OpenBLAS/lib/x86/v140/libopenblas.exp and /dev/null differ
diff --git a/lib/3rdParty/OpenBLAS/lib/x86/v140/libopenblas.lib b/lib/3rdParty/OpenBLAS/lib/x86/v140/libopenblas.lib
deleted file mode 100644
index 97a17986..00000000
Binary files a/lib/3rdParty/OpenBLAS/lib/x86/v140/libopenblas.lib and /dev/null differ
diff --git a/matlab_runners/Demos/run_demo_images.m b/matlab_runners/Demos/run_demo_images.m
index 2bd016f7..ba83382f 100644
--- a/matlab_runners/Demos/run_demo_images.m
+++ b/matlab_runners/Demos/run_demo_images.m
@@ -21,10 +21,13 @@ verbose = true;
%model = 'model/main_clm_wild.txt';
% Trained on in the wild and multi-pie data (more accurate CLNF model)
-model = 'model/main_dclm_general.txt';
+%model = 'model/main_clnf_general.txt';
% Trained on in-the-wild
%model = 'model/main_clnf_wild.txt';
+% Trained on in the wild and multi-pie data (most accurate CE-CLM model)
+model = 'model/main_ceclm_general.txt';
+
command = executable;
command = cat(2, command, [' -fdir "' in_dir '"']);
diff --git a/matlab_runners/Demos/run_demo_video_multi.m b/matlab_runners/Demos/run_demo_video_multi.m
index a181448c..663a7019 100644
--- a/matlab_runners/Demos/run_demo_video_multi.m
+++ b/matlab_runners/Demos/run_demo_video_multi.m
@@ -22,10 +22,13 @@ verbose = true;
%model = 'model/main_clm_wild.txt';
% Trained on in the wild and multi-pie data (more accurate CLNF model)
-model = 'model/main_clnf_general.txt';
+% model = 'model/main_clnf_general.txt';
% Trained on in-the-wild
%model = 'model/main_clnf_wild.txt';
+% Trained on in the wild and multi-pie data (most accurate CE-CLM model)
+model = 'model/main_ceclm_general.txt';
+
command = executable;
command = cat(2, command, [' -mloc "', model, '"']);
% add all videos to single argument list (so as not to load the model anew
diff --git a/matlab_runners/Demos/run_demo_videos.m b/matlab_runners/Demos/run_demo_videos.m
index d44e25bf..fe201f18 100644
--- a/matlab_runners/Demos/run_demo_videos.m
+++ b/matlab_runners/Demos/run_demo_videos.m
@@ -23,10 +23,13 @@ verbose = true;
%model = 'model/main_clm_wild.txt';
% Trained on in the wild and multi-pie data (more accurate CLNF model)
-model = 'model/main_dclm_general.txt';
+% model = 'model/main_clnf_general.txt';
% Trained on in-the-wild
%model = 'model/main_clnf_wild.txt';
+% Trained on in the wild and multi-pie data (most accurate CE-CLM model)
+model = 'model/main_ceclm_general.txt';
+
command = executable;
command = cat(2, command, [' -mloc "', model, '"']);
% add all videos to single argument list (so as not to load the model anew