Rewrite for Nuvola Player 3