changed to fix slowness