fixed to work with songlist