added 2d plots, structure changed