Refactoring.
Add use of activated, for winning scenario.
More refactoring.