NP & NI Need Fixing