fixed chaps 5 and 6