Trying to fix slowness.