Chapter04 updated