Ex16 with NSB v5
Minor corrections