Updated data and plot calculations