still fixing moving speed