Adding latest version of RDPNFA.java