Updated to manual diff and nullFlavor to NA