+ 'raw' -> 'row' + minor changes