Added better song capability