Further updates to work with the v6 player