OAOOify buffer refilling