Updated chap 04 and 05