heavy changes to section 3.1