Somehow it got slow (at least now the code WAS changed)