Do Full MC NPA and added correct D3D npa geometry