Switched to same API as Frodo branch
Fixed playback