Improved row and column verification