Changed to row based accesses. No performance increase but syntax is slightly simpler