Added functionality (until chapter 5.5).
Added functionality (until chapter 5.5).