Changed implementation to remove player cast