partial rewrite of section 2, and a test figure