Feature/flash performance