fixing up speed issues. Full run should take about 1min.