New pdf changes - DON'T MERGE YET