reorder and test.c fixed with plotter