fixing the slowness