[@VitaVitaAR] Added two more NPs. Let me know if any more changes are needed.