improve chapter4 and leon