finally added playlist support