Updated chapter implementation