Updated with PDF exports