NSF 58-2002 Addendum 2.0