updated to support new row classes