Issue #6:
Change the condition for modify the speed