Rework section 2.5