Started clean-up of Question 21.