Changes to add R3Player, etc.