Change: Better \chapter hooking