updated codes for NeP2P v_a16