Continued refactoring the target player.