Renamed oldX -> x