fix speed and test