Make all changes to vignette per Robyn's suggestions