Buffer management replacement