Reworked chapters into questions