Sync changes with the 320

With velocity mode