Changed flushing strategy