Improved performance on Flash