Supplement Email-PDF logic done