modified around EOF