Pre-render updates - all working