Improving final chapter