Added NP checks