move buffer update to same place as other updates