Chapter3, Chapter4, Chapter5, Chapter6, Chapter7, Chapter8: Fix Issue #8