tested functionality post-pull request

FIS and NP don't work, updated wd