Changed matching output format