Most recent build with some clean up