(1) Paragraph 17 of Schedule 7 to the Terrorism Act 2000 (c. 11) (port and border controls: passenger information) is amended as follows.
(2) For sub-paragraph (1) substitute-
"(1) This paragraph applies to a ship or aircraft which-
(a) arrives or is expected to arrive in any place in the United Kingdom (whether from another place in the United Kingdom or from outside the United Kingdom), or
(b) leaves or is expected to leave the United Kingdom."
(3) In sub-paragraph (4) -
(a) omit the "or" at the end of paragraph (b), and
(b) after paragraph (c) add- ", or
(d) to goods."