Made optimizations, now running in ~20 mins.