Add improvements for second chapter