trying to fix the speeeed issue