Updated to match book structure