Changes in the way the plots are generated