Section 3 of the Principal Act is amended as follows:

(a) by omitting the definition of certificate of registration as user or supplier of private water and substituting the following definitions:

certificate of registration as a supplier of water from a private water source means the certificate referred to in section 136 ;

certificate of registration as a water carrier means the certificate referred to in section 136H ;

(b) by inserting the following definition after the definition of cigarette shipper :

clinical assessment means an assessment of the health of a person and includes, but is not limited to including, the following:

(a) any physical or psychological examination;

(b) the taking of samples of any substance or secretion from the body of a person;

(c) an assessment of the health of a person whether by viewing, listening to, or corresponding with, the person or by another method;

(d) tests to determine the health of the person;

(e) any other prescribed method of assessing the health of a person;

(c) by omitting the definition of contaminant ;

(d) by inserting the following definition after the definition of council fee :

designated smoking area means an area that is specified, in an approval under section 67I that is in force, to be a designated smoking area;

(e) by inserting ", signs or conditions," after "symptoms" in paragraph (c) of the definition of disease ;

(f) by inserting "and, while an amendment to a guideline under section 17A is in force, means a guideline as so amended" after " section 184 " in the definition of guidelines ;

(g) by omitting the definition of human pathogenic organism ;

(h) by omitting "diagnostic" from the definition of laboratory ;

(i) by omitting the definition of medical examination ;

(j) by omitting " Medicare Australia Act 1973 " from the definition of Medicare Australia and substituting " Human Services (Medicare) Act 1973 " ;

(k) by inserting the following definition after the definition of non-tobacco cigarette :

notifiable contaminant means –

(a) an organism, or substance, that is –

(i) declared in a notice under section 40(b) to be a notifiable contaminant; or

(ii) a member of a class of organisms or substances, members of which are declared in a notice under section 40(b) to be notifiable contaminants; and

(b) a toxin that is produced by –

(i) an organism that is declared in a notice under section 40(b) to be a notifiable contaminant; or

(ii) a member of a class of organisms, members of which are declared in a notice under section 40(b) to be notifiable contaminants;

(l) by omitting the definition of notifiable disease and substituting the following definition:

notifiable disease means –

(a) a disease declared in a notice under section 40 to be a notifiable disease; and

(b) a disease that is a member of a class of diseases, members of which are declared in a notice under section 40 to be notifiable diseases;

(m) by omitting "a licensee and" from paragraph (a) of the definition of occupier ;

(n) by omitting "a licensee and" from paragraph (b)(ii) of the definition of occupier ;

(o) by omitting the definition of personal information and substituting the following definition:

personal information , in relation to a person, means the person's name, address and contact details;

(p) by omitting the definition of private water source and substituting the following definition:

private water source means a source of water used to supply water for human consumption, other than water infrastructure used by a regulated entity for that purpose;

(q) by inserting "but does not include any part of a smoke-free area that is a designated smoking area" after " section 67B(1) " in the definition of smoke-free area ;

(r) by omitting "confectionery or" from the definition of solid food .