Rows Logic changed