ROWS class updated and main