Merged so that songs are correctly added and sent