Corrected base path and added nwmatcher