Simplified row logic