Renamed Command.X to Command.Col and Command.Y to Command.Row