Reworked chapter structure