PDF Generator Changes (not complete)