Abdullah - PDF generation changes