NPT codes added + NPT RHC codes