Small modification for Chapter6&7