Fixed player, tested, no thorougly though