Chapter 3 advanced scenarios
Merge branch 'chapter_3_advanced'