refactor, continue FlashBuffer