Should work now with new player