Adding stuff for PDF syst
Solving conflict