#20 better speed changement