Tentative changes to build and plot code.