Refacto + add_pdf