removed currentRow stuff