This should go before the flush?