diff --git a/Utilities/Install/optiSolverPack_Install.m b/Utilities/Install/optiSolverPack_Install.m
index fc5a6de..12a2206 100644
--- a/Utilities/Install/optiSolverPack_Install.m
+++ b/Utilities/Install/optiSolverPack_Install.m
@@ -439,16 +439,17 @@ if(~isempty(strfind(str,rep)))
     str = fileread([nmdpath '/Eval_Point.cpp']); 
     str = sprintf('%s/n/n%s',str,'void NOMAD::Eval_Point::reset_tags_and_bbes ( void ) {_current_tag = 0;_current_bbe = 0;_current_sgte_bbe = 0;}');
     str = sprintf('%s/n/n%s',str,'bool NOMAD::Eval_Point::is_eval_ok ( void ) const { return (_eval_status == NOMAD::EVAL_OK); }');
-    str = sprintf('%s/n/n%s',str,'bool NOMAD::Eval_Point::is_feasible ( const NOMAD::Double & h_min ) const { return ( _h.is_defined() && _h <= h_min ); }');
+    %str = sprintf('%s/n/n%s',str,'bool NOMAD::Eval_Point::is_feasible ( const NOMAD::Double & h_min ) const { return ( _h.is_defined() && _h <= h_min ); }');
     fp = fopen([nmdpath '/Eval_Point.cpp'],'w');
     fprintf(fp,'%s',str); fclose(fp);
 end
 sdir = nmdpath;
-name = 'libnomad';
+name = 'nomad';
 opts = [];
 opts.exPP = {'_CRT_SECURE_NO_WARNINGS'};
 opts.exclude = 'nomad.cpp';
 VSPRJ(n).sdir = sdir; VSPRJ(n).hdrs = []; VSPRJ(n).name=name; VSPRJ(n).opts=opts; n = n + 1;
+lib = [' -L/home/evs16132/mex/src/nomad.3.8.1/lib -lnomad '];
 %Write the Solution File
 % VS_WriteSol(VSPRJ)
 
@@ -584,7 +585,7 @@ inc = [inc '-I' nmdpath ' -I' nmdpath '/../ext/sgtelib/src '];
 [~,mkl_for_link,mkl_inc,mkl_lib,mkl_clib] = opti_FindMKL();
 inc = [inc '-I"' mkl_inc '" '];
 %Get MKL Fortran Libs
-lib = [' -L"' mkl_lib '" -L"' mkl_clib '" ' mkl_for_link];
+lib = [lib ' -L"' mkl_lib '" -L"' mkl_clib '" ' mkl_for_link];
 %Get Ctrl-C Library
 lib = [lib '-lut '];
 
@@ -622,11 +623,7 @@ for i = 1:length(files)
             break;
         end
     end
-    if(strcmp(computer,'PCWIN'))
-        libl = [lib ' -L"' cd '" -loptiSolverPack' pk '32  ']; 
-    else
-        libl = [lib ' -L"' cd '" -loptiSolverPack' pk '64  '];
-    end
+    libl = [lib]; 
         
     %Compile & Move
     if(isempty(strfind(files{i},'.'))) %multiple files