rework section 8.4, see #263