NP sets updated to current format