Improve chap 1 and 2