Update to meet XTA timing with previous buffer fix