refactored nfit family functions; should avoid major merge conflicts this way