Movement.cs modified