Re-implemented the playlist controller