Evolving format

Includes location for plots
Reformat