Added option to return while music is playing