Finish ch11 tasks