HUGE speed fix.