Improved rows and speed