Changed structure and fiddled with plotters