updated with chap 1