Updated Self and Opponent