finished rewrite of section 2.3