and now with added CORRECT ROW FIELDS