[fi] Made some improvements in Chapter 2.4