Improvements chap 1-4