change NP
fix some Errors for new NP