re-edit chap 2