Improve ROW (thanks to Hundsbuah)