complete section 2.3 and part of 2.4