Some changes on player