Changes on player implementation