Upgrade Move.cs