fixed ch07
done ch08