diff --git a/src/data/csv/segues.csv b/src/data/csv/segues.csv
index 8d4635d1c85..b2e14695559 100644
--- a/src/data/csv/segues.csv
+++ b/src/data/csv/segues.csv
@@ -2985,3 +2985,7 @@ id,from_perf_id,type,to_perf_id,notes
 3276,5163,>,5164,
 3277,5164,->,5165,
 3278,5165,>,5166,
+3279,5167,>,5168,
+3280,5169,->,5170,
+3281,5170,>,5171,
+3282,5171,->,5172,
diff --git a/src/data/csv/sets.csv b/src/data/csv/sets.csv
index cd14563ea3f..914334b6914 100644
--- a/src/data/csv/sets.csv
+++ b/src/data/csv/sets.csv
@@ -866,3 +866,5 @@ id,setlist,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,id_r
 867,5153:5154:5155:5156:5157:5158:5159,5153,5154,5155,5156,5157,5158,5159,,,,,,,,,,,,,,,,867
 868,5160,5160,,,,,,,,,,,,,,,,,,,,,,868
 869,5161:5162:5163:5164:5165:5166,5161,5162,5163,5164,5165,5166,,,,,,,,,,,,,,,,,869
+870,5167:5168:5169:5170:5171:5172,5167,5168,5169,5170,5171,5172,,,,,,,,,,,,,,,,,870
+871,5173,5173,,,,,,,,,,,,,,,,,,,,,,871
diff --git a/src/data/csv/songperformances.csv b/src/data/csv/songperformances.csv
index 57b541a599c..bfa0be05241 100644
--- a/src/data/csv/songperformances.csv
+++ b/src/data/csv/songperformances.csv
@@ -4882,3 +4882,10 @@ id,song_id,song_name,id_rhs,variation,notes,set_id,show_id,prev_perfid,prev_show
 5164,241,The Wheel,,,,869,326,,,,,,,
 5165,255,Uncle John's Band,,,,869,326,,,,,,,
 5166,115,I Need A Miracle,,,,869,326,,,,,,,
+5167,570,Tangled Up in Blue,,,,870,326,,,,,,,
+5168,74,Feel Like a Stranger,,,,870,326,,,,,,1,
+5169,24,Black Peter,,,,870,326,,,,,,,
+5170,233,The Music Never Stopped,,,with Marco solo,870,326,,,,,,,
+5171,195,Scarlet Begonias,,,,870,326,,,,,,,
+5172,110,I Know You Rider,,,,870,326,,,,,,,
+5173,823,Instant Karma,,,,871,326,,,,,,,
diff --git a/src/data/csv/songs.csv b/src/data/csv/songs.csv
index 77ba7528e65..157178d76c2 100644
--- a/src/data/csv/songs.csv
+++ b/src/data/csv/songs.csv
@@ -91,7 +91,7 @@ id,title,author,nicknames,suite,performances,copy_id,core_gd,cover_gd,cover_jg,c
 560,Simple Twist of Fate,Bob Dylan,,,,560,,TRUE,,,,1976,,
 562,Slow Train,Bob Dylan,,,,562,,TRUE,,,,1987,,
 212,Stuck Inside of Mobile With the Memphis Blues Again,Bob Dylan,Memphis Blues,,2771:3772:4293:4634:4719:4926:4983,212,,TRUE,,,,1987,,
-570,Tangled Up in Blue,Bob Dylan,,,4200:4320:4739:5061:5118,570,,TRUE,,,,1976,,
+570,Tangled Up in Blue,Bob Dylan,,,4200:4320:4739:5061:5118:5167,570,,TRUE,,,,1976,,
 220,"Tell Me, Momma",Bob Dylan,,,1898:2220:2319:2321:2376:2688:2844:3004:3101:3253:3461:3591:3702:3875:4026:4260:4348:4641:4691:4838:5088,220,,,,,,,,
 748,The Ballad of Frankie Lee and Judas Priest,Bob Dylan,,,,747,,TRUE,,,,1987,,
 181,The Mighty Quinn,Bob Dylan,Mighty Quinn,,400:624:840:1389:1586:3055:3423:3917:4286,181,,TRUE,,,Quinn the Eskimo,1986,,
@@ -347,11 +347,12 @@ id,title,author,nicknames,suite,performances,copy_id,core_gd,cover_gd,cover_jg,c
 544,Rain,John Lennon & Paul McCartney (The Beatles),,,4447:4686,544,,TRUE,,,,1992,,
 186,Revolution 9,John Lennon & Paul McCartney (The Beatles),,,178,186,,TRUE,,,,,,
 577,Tomorrow Never Knows,John Lennon & Paul McCartney (The Beatles),,,,577,,TRUE,,,,1992,,
+823,Instant Karma,John Lennon & Yoko Ono (Plastic Ono Band),,,5173,823,,,,,We All Shine On,1970,https://en.wikipedia.org/wiki/Instant_Karma!,
 496,Heaven Help the Fool,John Perry Barlow & Bob Weir,,,,,TRUE,,,,,1980,,
 25,Black Throated Wind,John Perry Barlow & Bob Weir (Grateful Dead),,,424:486:680:835:837:911:1075:1432:1463:1583:1827:1999:2101:2206:2517:2572:2930:2978:3084:3149:3261:3311:3454:3504:3610:3758:3830:3936:4029:4082:4108:4272:4377:4498:4626:4679:4806:4922:5092,25,TRUE,,,,,1972,,BTW
 38,Cassidy,John Perry Barlow & Bob Weir (Grateful Dead),,,284:470:554:877:1174:1369:1434:1489:1793:2058:2093:2169:2484:2937:3256:3413:3683:3792:3904:4093:4167:4329:4418:4518:4638:4928:5089:5156:5161,38,TRUE,,,,,1974,,
 69,Estimated Prophet,John Perry Barlow & Bob Weir (Grateful Dead),Estimated,,11:118:149:242:251:390:456:538:616:779:809:888:906:1027:1052:1179:1210:1246:1318:1403:1437:1455:1560:1591:1637:1720:1767:1926:1952:2045:2216:2276:2402:2430:2539:2603:2652:2774:2803:2859:2953:2984:2999:3044:3079:3104:3220:3265:3355:3393:3448:3502:3558:3615:3682:3794:3862:3961:3988:4034:4062:4137:4181:4249:4261:4370:4474:4497:4520:4592:4662:4673:4772:4793:4852:4968:5005:5021:5122,69,TRUE,,,,,1977,,
-74,Feel Like a Stranger,John Perry Barlow & Bob Weir (Grateful Dead),Stranger,,211:237:319:422:567:627:677:735:829:893:940:1050:1150:1242:1303:1414:1450:1543:1634:1741:1773:2013:2068:2125:2224:2262:2311:2368:2412:2441:2492:2574:2616:2650:2675:2733:2817:2846:2878:3013:3015:3018:3042:3107:3219:3242:3325:3407:3419:3465:3518:3552:3589:3732:3808:3856:3879:3967:4008:4051:4148:4203:4316:4414:4458:4575:4623:4694:4748:4804:4818:4873:5007:5062:5095:5136,74,TRUE,,,,,1980,,
+74,Feel Like a Stranger,John Perry Barlow & Bob Weir (Grateful Dead),Stranger,,211:237:319:422:567:627:677:735:829:893:940:1050:1150:1242:1303:1414:1450:1543:1634:1741:1773:2013:2068:2125:2224:2262:2311:2368:2412:2441:2492:2574:2616:2650:2675:2733:2817:2846:2878:3013:3015:3018:3042:3107:3219:3242:3325:3407:3419:3465:3518:3552:3589:3732:3808:3856:3879:3967:4008:4051:4148:4203:4316:4414:4458:4575:4623:4694:4748:4804:4818:4873:5007:5062:5095:5136:5168,74,TRUE,,,,,1980,,
 115,I Need A Miracle,John Perry Barlow & Bob Weir (Grateful Dead),Miracle,,240:637:986:1156:2052:2182:2349:2370:2457:2591:2655:2667:2705:2756:2870:2944:2983:3061:3155:3217:3289:3366:3434:3479:3554:3640:3774:3867:3987:4056:4142:4213:4283:4369:4460:4477:4660:4777:4828:4956:5052:5166,115,TRUE,,,,,1978,,
 130,Lazy Lightning,John Perry Barlow & Bob Weir (Grateful Dead),,,44:52:308:662:1118:2235:3151:3975:4885,130,TRUE,,,,,1976,,LL
 137,Looks Like Rain,John Perry Barlow & Bob Weir (Grateful Dead),,,766:2898:3944:4217,137,TRUE,,,,,1972,,LLR
@@ -363,7 +364,7 @@ id,title,author,nicknames,suite,performances,copy_id,core_gd,cover_gd,cover_jg,c
 193,Saint of Circumstance,John Perry Barlow & Bob Weir (Grateful Dead),Saint,,209:314:328:392:549:621:755:1483:1615:1724:1776:1905:1972:2062:2249:2336:2503:2611:2875:2923:3123:3278:3328:3390:3428:3542:3628:3766:3899:3980:4024:4065:4175:4308:4325:4381:4537:4598:4630:4766:4790:4943:4998:5125,193,TRUE,,,,,1979,,
 626,Salt Lake City,John Perry Barlow & Bob Weir (Grateful Dead),,,,626,TRUE,,,,,1978,,SLC
 219,Supplication,John Perry Barlow & Bob Weir (Grateful Dead),,,309:4886,219,TRUE,,,,,1976,,
-233,The Music Never Stopped,John Perry Barlow & Bob Weir (Grateful Dead),,,131:192:228:248:403:447:475:635:658:757:811:913:1034:1086:1181:1200:1224:1293:1335:1426:1460:1509:1568:1663:1686:1762:1984:2001:2118:2136:2152:2296:2298:2354:2420:2460:2511:2568:2622:2691:2722:2862:2864:2950:3082:3129:3194:3302:3510:3622:3673:3741:3788:3853:4077:4079:4120:4236:4280:4323:4400:4448:4527:4556:4644:4770:4836:4954:4987:5001:5047:5112:5115,233,TRUE,,,,,1975,,TMNS
+233,The Music Never Stopped,John Perry Barlow & Bob Weir (Grateful Dead),,,131:192:228:248:403:447:475:635:658:757:811:913:1034:1086:1181:1200:1224:1293:1335:1426:1460:1509:1568:1663:1686:1762:1984:2001:2118:2136:2152:2296:2298:2354:2420:2460:2511:2568:2622:2691:2722:2862:2864:2950:3082:3129:3194:3302:3510:3622:3673:3741:3788:3853:4077:4079:4120:4236:4280:4323:4400:4448:4527:4556:4644:4770:4836:4954:4987:5001:5047:5112:5115:5170,233,TRUE,,,,,1975,,TMNS
 609,This Time Forever,John Perry Barlow & Bob Weir (Grateful Dead),,,,609,TRUE,,,,,1978,,
 245,Throwing Stones,John Perry Barlow & Bob Weir (Grateful Dead),,,127:155:287:363:406:441:523:592:612:714:788:845:886:916:1003:1107:1189:1287:1339:1440:1497:1499:1652:1691:1693:1758:1802:1919:1982:2008:2010:2107:2140:2142:2200:2260:2286:2333:2367:2435:2525:2593:2721:2730:2839:2907:2962:3021:3066:3091:3201:3353:3405:3437:3483:3563:3630:3777:3845:3882:3884:3910:3912:4046:4158:4209:4268:4373:4390:4392:4394:4494:4577:4709:4781:4843:4930:4990:5044:5070:5142,245,TRUE,,,,,1982,,
 738,Blow Away,John Perry Barlow & Brent Mydland (Grateful Dead),,,,738,TRUE,,,,,1988,,
@@ -568,7 +569,7 @@ id,title,author,nicknames,suite,performances,copy_id,core_gd,cover_gd,cover_jg,c
 18,Bertha,Robert Hunter & Jerry Garcia (Grateful Dead),,,1:27:76:227:250:337:416:494:524:634:663:719:792:885:1002:1076:1142:1213:1229:1302:1407:1610:1754:1913:1977:2000:2063:2106:2145:2299:2348:2369:2475:2519:2573:2677:2728:2729:2906:2960:3085:3131:3150:3209:3267:3329:3505:3632:3669:3751:3837:3958:4007:4107:4216:4366:4615:4666:4775:4808:4837:4921:5069:5093:5138,18,TRUE,,,,,1971,,
 22,Bird Song,Robert Hunter & Jerry Garcia (Grateful Dead),,,133:202:271:561:799:1060:1258:1344:1544:1639:1948:1950:2264:2266:2374:2681:2976:3279:3281:3588:3775:3841:3913:4015:4170:4301:4376:4446:4550:4639:4764:4867:5055:5079:5130,22,TRUE,,,,,1971,,
 23,Black Muddy River,Robert Hunter & Jerry Garcia (Grateful Dead),,,2889:3698:4344,23,TRUE,,,,,1986,,
-24,Black Peter,Robert Hunter & Jerry Garcia (Grateful Dead),,,207:551:887:2340:2731:3672:4570:4941:5110:5113,24,TRUE,,,,,1969,,
+24,Black Peter,Robert Hunter & Jerry Garcia (Grateful Dead),,,207:551:887:2340:2731:3672:4570:4941:5110:5113:5169,24,TRUE,,,,,1969,,
 26,Blues for Allah,Robert Hunter & Jerry Garcia (Grateful Dead),,,1390:3168:3323:4624,26,TRUE,,,,,1975,,
 30,Brokedown Palace,Robert Hunter & Jerry Garcia (Grateful Dead),,,42:130:301:753:1421:1878:1992:2098:2292:3240:3527:3593:3946:4332:4855,30,TRUE,,,,,1970,,
 32,Brown-Eyed Women,Robert Hunter & Jerry Garcia (Grateful Dead),,,6:132:170:235:254:388:502:597:679:808:881:915:1006:1117:1219:1260:1316:1412:1486:1605:1618:1688:1847:1849:1890:2097:2137:2187:2285:2426:2501:2638:2703:2723:2951:3030:3083:3127:3167:3246:3346:3383:3431:3484:3525:3545:3625:3651:3716:3835:3897:4047:4235:4311:4404:4489:4591:4692:4830:4864:5049:5154,32,TRUE,,,,,1971,,BEW
@@ -606,7 +607,7 @@ id,title,author,nicknames,suite,performances,copy_id,core_gd,cover_gd,cover_jg,c
 187,Ripple,Robert Hunter & Jerry Garcia (Grateful Dead),,,116:482:965:1790:1942:2309:3159:3666:4178:4633:4884:5132,187,TRUE,,,,,1970,,
 546,Rosemary,Robert Hunter & Jerry Garcia (Grateful Dead),,,,546,TRUE,,,,,1968,,
 190,Row Jimmy,Robert Hunter & Jerry Garcia (Grateful Dead),,,26:673:759:795:875:992:1057:1217:1227:1304:1436:1534:1725:1765:2014:2245:2393:2453:2533:2609:2712:2798:2873:2996:3039:3252:3354:3598:3713:3851:3940:4076:4136:4287:4398:4543:4737:4850:5011,190,TRUE,,,,,1973,,
-195,Scarlet Begonias,Robert Hunter & Jerry Garcia (Grateful Dead),Scarlet,,30:92:114:194:238:249:407:489:553:732:764:833:890:920:970:1054:1236:1488:1494:1584:1609:1854:1906:1965:2057:2067:2207:2446:2508:2559:2612:2664:2829:2885:2959:3034:3147:3202:3363:3519:3644:3689:3807:3938:3990:4030:4058:4134:4207:4309:4341:4365:4378:4481:4513:4567:4640:4779:4819:4839:4929,195,TRUE,,,,,1974,,
+195,Scarlet Begonias,Robert Hunter & Jerry Garcia (Grateful Dead),Scarlet,,30:92:114:194:238:249:407:489:553:732:764:833:890:920:970:1054:1236:1488:1494:1584:1609:1854:1906:1965:2057:2067:2207:2446:2508:2559:2612:2664:2829:2885:2959:3034:3147:3202:3363:3519:3644:3689:3807:3938:3990:4030:4058:4134:4207:4309:4341:4365:4378:4481:4513:4567:4640:4779:4819:4839:4929:5171,195,TRUE,,,,,1974,,
 196,Shakedown Street,Robert Hunter & Jerry Garcia (Grateful Dead),Shakedown,,8:29:62:117:167:232:315:343:344:425:455:495:530:569:593:613:692:734:860:899:927:959:1029:1121:1135:1250:1331:1503:1523:1651:1708:1737:1825:1922:1958:2080:2250:2271:2308:2406:2432:2496:2579:2654:2700:2753:2781:2813:2838:2874:2943:2965:3014:3029:3141:3249:3260:3365:3391:3443:3444:3453:3499:3507:3543:3583:3634:3671:3748:3826:3883:3929:4027:4066:4141:4179:4240:4277:4347:4397:4433:4528:4558:4650:4715:4801:4827:4878:4945:4965:5043:5145,196,TRUE,,,,,1978,,
 403,Ship of Fools,Robert Hunter & Jerry Garcia (Grateful Dead),,,3778,403,TRUE,,,,,1974,,
 207,Stagger Lee,Robert Hunter & Jerry Garcia (Grateful Dead),,,212:3160:3771:4444:4905:5101,207,TRUE,,,,,1978,,
@@ -745,7 +746,7 @@ id,title,author,nicknames,suite,performances,copy_id,core_gd,cover_gd,cover_jg,c
 92,Happy Birthday,traditional,,,129:196:966:1008:1681:2047:2049:2209:4339,92,TRUE,,,,,,,
 101,He Was a Friend of Mine,traditional,,,1405,101,,TRUE,,,Just a Hand to Hold,1966,,
 682,I Got a Mind to Give Up Livin',traditional,,,,682,,TRUE,,,,1982,,
-110,I Know You Rider,traditional,Rider,,10:65:95:134:166:245:264:385:458:479:533:565:589:602:681:715:727:750:819:926:957:1056:1166:1208:1276:1333:1347:1466:1552:1587:1607:1743:1877:1891:1902:1986:2131:2239:2323:2343:2466:2494:2561:2607:2658:2666:2764:2819:2850:2902:2939:3012:3063:3115:3179:3228:3283:3364:3402:3433:3516:3557:3592:3633:3679:3871:3991:4059:4083:4109:4253:4319:4408:4425:4438:4482:4515:4572:4627:4671:4682:4795:4866:5015:5029,110,TRUE,,,,,1965,,
+110,I Know You Rider,traditional,Rider,,10:65:95:134:166:245:264:385:458:479:533:565:589:602:681:715:727:750:819:926:957:1056:1166:1208:1276:1333:1347:1466:1552:1587:1607:1743:1877:1891:1902:1986:2131:2239:2323:2343:2466:2494:2561:2607:2658:2666:2764:2819:2850:2902:2939:3012:3063:3115:3179:3228:3283:3364:3402:3433:3516:3557:3592:3633:3679:3871:3991:4059:4083:4109:4253:4319:4408:4425:4438:4482:4515:4572:4627:4671:4682:4795:4866:5015:5029:5172,110,TRUE,,,,,1965,,
 511,I've Been All Around This World,traditional,Been All Around This World,,,511,,TRUE,,,,1969,,
 671,In the Pines,traditional,,,,671,,TRUE,,,,1966,,
 422,It Hurts Me Too,traditional,Hurts Me Too,,3968:4085:4201:4501:4749:4966,422,TRUE,,,,,1966,,
diff --git a/src/data/csv/teases.csv b/src/data/csv/teases.csv
index 466e1aad0f3..6638374c801 100644
--- a/src/data/csv/teases.csv
+++ b/src/data/csv/teases.csv
@@ -1671,3 +1671,8 @@ id,within,performance_id,song_name,notes,by,song_id
 1684,I Need A Miracle,5166,(Baby) Hully Gully,,,683
 1685,Uncle John's Band,5165,Brown Eyed Girl,,,822
 1686,I Need A Miracle,5166,Fearless,,,333
+1687,The Wheel,5164,Fearless,,,333
+1688,Feel Like a Stranger,5168,Another Brick in the Wall,Dave,,297
+1689,Feel Like a Stranger,5168,West LA Fadeaway,guitars/Marco,,264
+1690,The Music Never Stopped,5170,[unknown],classical in Marco's solo??,,288
+1691,I Know You Rider,5172,Fearless,guitars,,333