Fix the slowness issue, thankgod