Fixed ch 10 problems