Updated casing module based on chapter feedback