better handling pre-plot data