Reworked document, with bibliography