Reworked section 3.4