Adding changes from allplayers.com